I've been going through hell with the same problem and I'm finally picking my car up tomorrow since dropping it off in June. It turned out to be the fuel pump controller on mine.
I hope that what is was and I have no more issues. GL on yours but check you fpc.